Backport of #16610 from 2014.7

cherry-pick of 004f940c16e0c8f316ff39cba001fb4099210917

fixes I regression I introduced in e75f47430f7a96334e6c02ea1fc16ab7e2888135