Revert bb43c0d..cc1d2ed

This rolls back to commit bb43c0d7f8c78d641a1b07ceb11c22697ce375b0.