Back out index-setting in deserialize again.

This breaks the Panda build on some platforms.