Revert c949ec5..3526b1f

This rolls back to commit c949ec5c7bf6157d34f952ed68309467acf85802.