Revert c6f0998..701b394

This rolls back to commit c6f09985d00a7fe51d46506d4b486767a919d01d.