Revert 14c6542