refixing bug 27338 with all parser test fixes, reverts r91557