Fix import error at deploy (bug 1097157)