Omit the workaround patch