Reverting my changes to fix failing unit tests - - TRUNK-3928