Revert 804b5ac..21ba356

This rolls back to commit 804b5acf40af4faf00e610fe8ddaf2d347312f25.