Revert 46cd8ea..81045c1

This rolls back to commit 46cd8eaa6de5a0ddc9e0282fb0b3ca00b1d30b77.