The original issue is still there on a freshly installed 42.1. Will the shim from #950569 be released for 42.1 at some stage?