Revert 6ffd374..b52963b

This rolls back to commit 6ffd37455426f3f86f89a23ecca98556c9fd4c88.