Revert 3f1f168..d1632db

This rolls back to commit 3f1f1681a24bc176499262f1c0df0572ee4ce2fa.