Revert 5dfbf5f..112856b

This rolls back to commit 5dfbf5f9035088194a2ed9cb4deb836a978b1f6a.