Revert 78cf64a..69e3ca8

This rolls back to commit 78cf64a39c8738db5920ee24f8e2f768dfc18d2c.