Revert some Rwsem updates