Revert 01c34a5..2779377

This rolls back to commit 01c34a58ee0502eda7e282311d870806c8c833ba.