Removed poorly cherry-picked code.