Remove bugfix resolved in r5