[#3575] Reverted fix