Fix for Vanilla-238.