Revert 10947e7..7c84339

This rolls back to commit 10947e793e0c1c588dbe677e347d136fde73b6c8.