This reverts commit aa412c72fc. This workaround is not needed anymore after the fix in c24688c Original commit: 0217121814
aa412c72fc
0217121814