cleanup after #4092

fixes #4086