Imported change f92f63b53bf9b49bae911332e5734cbdec4e5aa4
Drop non-standard <function>.name assigning