block this patch from 1.2, it's already fixed here as part of a larger commit