fake ap is back to the original
merge