Hack to get rid of the extra getDef call.

Doing port to master for Gordon to fix performance regression.

@bug W-2135711@
@rev goliver@
Merging origin/tbliss/master-pending-extra-getDef-call-192-port into master