Remove bugfix resolved in r1478