Revert 7eef10c..ed0a075

This rolls back to commit 7eef10cc970e82f6bfcfb86be9622eaf77c03b28.