Relatively straightforward, creating bug to track progress.
This has become a trivial change. Merging it with bug 73495. *** This bug has been marked as a duplicate of bug 73495 ***