Revert 88ffd32..81ee4cd

This rolls back to commit 88ffd321c3edbf738382a913a0a7efa897ad98b8.