The root core of problem #1179 is actually an upstream problem. Our code is only necessary until we can consume the fixed version of annotator.
