T2972
Depends on D13466
Bug that I caught doing some other tests. This will be corrected when 'use strict' is implemented across the app, but that change should come after this giant stack lands. Pushing this diff up so it's not forgotten / overlooked.