Remove bugfix for issue resolved in r1287