Revert 7d91ccd..25faf94

This rolls back to commit 7d91ccd488db2648c9983e125676bed58927febe.