No more necessary after Patch 7.4.391