Comment 4 for bug 1718782

Noting for whoever reviews this (which might be myself, later) that an AngularJS follow-up for this patch would be both advisable and straightforward to do, given the target to 3.5.x and the potential of also targeting this to 3.4.x.