Quick fix to make tests stop failing, refs T854