PMO-2741 Exercised locally; hope auto tests don't break again.