Revert f551aca..390cdbc

This rolls back to commit f551aca624c03cc962811c5ad45a6365332396eb.