Remove bugfix resolved in r1469