Bug 860370 - Undo functionality change from bug 848973. r=roc