Revert d07dbe4..c53603b

This rolls back to commit d07dbe4774db2f0e1feaea660938b20185135ef9.