Revert bb308c7..f1428cd

This rolls back to commit bb308c7bdf356eab458733eee5d1322fea9c5a14.