Fixes #5623 (closed), #5127 (closed).
Untested, no idea if it works. Maybe @Heretek skipped it for a reason in !11595 (merged), but it looks more like a copy/paste mistake to me and I can't see anything obviously wrong with including it.