Revert r1404 and keep it on a development branch until it is fully tested.