Remove bugfix for issue resolvd in r1266