If FaceName wasn't previously present we need to remove it. Change-Id: I1e463f2b159de15838efe9f504ab5340aa5f2342