Revert 79b77cc..796de7a

This rolls back to commit 79b77ccbb07433312e6b579225e4afac497767bf.