Revert "Track PhaseBeam 4.4 branch from Omni"

This reverts commit 8cc5e70a8253b10e1bc7b5b7976014fbcfc96a7e.

Change-Id: Ieff13b35155f88b585d5bc6ed5828dfe1592dc24