Revert to c49b771ef14ce8fa520d79922712fa11ec285964