Trying to merge commits from megatron.  Seemed to not merge this change for some reason.  This fixes it.