Revert 70daf0 and e5f11a

e5f11a seems to have been a mistake