Remove some code refactoring that was incorrect.