You don't have to revert this. This has fixed one of these errors, but reverting 2cdb430bbadbdec84592db3f4dceffd49ccea019 is fixing both issues at once.