Workaround C.F.O.P not having a mask

Change-Id: I160b07703895b93da140016a9e8284e60e4bc916