Would you mind trying to uncomment these out and see if everything works? I can't remember why we commented them out, but we should either uncomment or remove. Not this PR.