Revert 2f7eca9..e1a5090

This rolls back to commit 2f7eca970073c33fe3c6261fd7c5677de338f31c.