Revert 7481cdd..be74e91

This rolls back to commit 7481cddb683d85647a3bf44b7633d2a4241d6f16.