Revert prior change - causing tests to fail..