Revert da470f9..5b1b23b

This rolls back to commit da470f9942010f1d84d6bc8b82f390c8dd5464e3.