Revert 7adc240..cc394eb

This rolls back to commit 7adc240145396860066abc21134c8781748e8781.