Revert "Temp fix for phone fc."

This reverts commit c033ea691b847581fe6ec0989f1a743467e08e7b.

Change-Id: Id018d284eff0d1d7070504aa4d349560c883d417