Revert 39936 and 39935;