Merge "Merge "Remove deleted fields/functions from greylist." am: 037a0879 am: bcaf7945 am: cac37202"