Revert to adb56cd78d3974b88ce141b26ca444e4be4996b0