Remove bugfix resolved in r1479