remove the guard, not needed anymore

fixes #3985
fixes #4246