Revert 9c88894..e5eb7a4

This rolls back to commit 9c8889422c1d58412e01e4a6a0ccdf2e56704fee.