Remove bugfix resolved in r1682