Revert to 39446cd80b768c8d3f6a6d417632ab57419e14bf