Apply the fix in 137494a7d0af3d72801c886d75cf6aa3f8db452c to (yet) another area that used that logic.
Apply the fix in 137494a7d0af3d72801c886d75cf6aa3f8db452c to (yet) another area that used that logic.

preed/quickrelease