Revert 58c1827..bbc6bd6

This rolls back to commit 58c1827b05bbdd95d326df16b70e2085098aa89c.