Revert 140177 - needs more investigation