Your browser does not seem to support JavaScript. As a result, your viewing experience will be diminished, and you have been placed in read-only mode.
Please download a browser that supports JavaScript, or enable it if it's disabled (i.e. NoScript).
I don't think that commit has been released yet, which would explain why you'd still have the error. You could have just cherry-picked that commit you linked, but what you did works as well. It might just end up conflicting with future upgrades.
@pitaj Thank you for the detailed answer, appreciate it!