Revert b8af02014a08f213ff180b3c81213c0a9fd13d0b (again)