Hotfix regression introduced in previous commit: Bug 820953