Merge fix (reverted from commit fac76902382164017dc08b5830d8d0def51a4522)