// NB: Redundant as of 8.1