Backout bug 892488 since there are tests that needs the prompt