Fix QA breakage caused by merge 0e82dcf9