Revert a9c64b6..ee2ae1a

This rolls back to commit a9c64b6d7330b895749db37fcd79a6dfa043518c.