Bug 975708: Fix java7 marker regression