[PATCH] TODO:remove me from E911 support