This is a temporary fix; will submit a change later that restores the performance improvement but fixes the drawing issue