A recent discussion in mattermost highlighted a problem in !3304 (merged).
This MR fixes the problem.