Undo multiple revisions

Since that requires a code change, it should go to bugzilla: unless someone picks it up immediately from here and reports it done within short time.