Revert to a7ca9ff2be94928bd2ca02e12dcef7a122c92849