Revert f79ad27..d97998b

This rolls back to commit f79ad27569cae3eb39c146ef59614c6358a2b9a9.