r15280: - remove the 2nd check for __FUNCTION__