If this breaks anything, I blame Jay. (cherry picked from commit 07b9fc9b3196151598f105e9025554b07efe5fa5)