Revert 6223ed6..6ec10c3

This rolls back to commit 6223ed68578e29466db465f423b9f20210b29145.