Reverted 44321 (bug #2230 by P.Lewis) - causing substantial increase in draw counts. Will add follow-up task to investigate