Revert 88086b4..e2fc72c

This rolls back to commit 88086b492e9393db3b37f35459aa20ae9efb3cb0.