The new semantics should match those of NetBSD and other systems. Change-Id: Ic9ca9d6b8c3e42d2a2953d9feea5f6bacaceb43c