Bug 16671: [QA Follow-up] Add new itemtype and remove bailout