Revert 06219c8..42eaa43

This rolls back to commit 06219c8ceaa52799f662b75cb5df41200b282358.