Revert 12f1245..02623dc

This rolls back to commit 12f1245354c413633615d26f3d2b636945e909a0.