Remove old workaround with reset 'true'