Revert one change. Ready for merge