Revert 260a6d5..695813a

This rolls back to commit 260a6d577961c30c74fe3b2bea3ed2c44494718e.