Comment 5 for bug 1332450

As some guys suggested, I split it to two commits, one is for l2-pop used and the other for l2-pop not used