Revert 19185c6..89f212d

This rolls back to commit 19185c6d6795dd3a6dbf623ed7efd40758991e59.