Migration for bug 959354