Revert 5bfa4fc..c4a5d11

This rolls back to commit 5bfa4fc07f8f18169773f85adb00413134bea7f6.