roll-back bugfix (wasn't a bug)