Revert 7ce6166..940ab6d

This rolls back to commit 7ce6166dae7f31b3ad402a477100428cf93c0b5c.