Revert 813ab3a..70faf07

This rolls back to commit 813ab3a6998824c61ece884abe4847cb5f3eef82.