Bugzilla/1062819 pickup rebased/mobile connection core

But ya, it's inconvenient right now.