Undoing unrelated local changes that got lumped in with the NORB wrapper feature push.