Revert a78eb7e..933e72d

This rolls back to commit a78eb7e5b2675137b744656b8acd1dfa8804f58f.