Revert 33096f8..79610a6

This rolls back to commit 33096f86acd021d44c25d8862c3c0ae185ff85c1.