Revert to c0937a3533