Revert #638 for a bit.