Revert f55fec5..9527b10

This rolls back to commit f55fec53421f53c96df8aa13309d6de51ece71b2.