Comment 3 for bug 2064296

I committed this in anticipation of using it in production next week. Because of the way our environment is set up, it is easiest to get code into main so we can use it in production.