Merge "this is only called from the ui thread, just make the calls directly."