Revert 7abf18a16