Revert 193b749..97e6fc8

This rolls back to commit 193b74923f5ae23109207f98df90afba105566dc.