Is this macro still needed?
Is there any test case which is solved by this patch?