This is a hackish but workable fix for bug 6415796. Change-Id: Iaba91e1e53e688a3ee05a1fdb68fd05102e369f2