Revert 413b5c3..b789cfc

This rolls back to commit 413b5c37b23bec1ed5e2747e3cc002396b98c387.