bug 1025322 - fix clobbering choices r=jlund