Revert c429be2..e0adcaf

This rolls back to commit c429be27203169153243c531476be98ec5196c8b.