Backing out the changes for NFVIFA(19)000278 for now.