Revert to eb97bbef605158a4452b95be544c1bc7bb80c895