Scrutinizer-ci confirmed the detection of this was a false-positive, so we can remove this workaround. They added it to their internal issue tracker.