Reverting an internal refactoring.