reverting change because it broke unit tests