Revert to b3fd6cdd9f1d2df6103204de54ff6c97f4878df9