Revert to 10b92609cbf77b8d3de25246376368d040dbfb28