Reapply changes from 763d14f98134b99d182d85f42566203d65949619 that were deleted by 441789507aa986251dcfebf85ee248280e20f1ca