bug 846864 - Fix source server support. r=khuey, a=bajaj
(transplanted from 8d4bdcbc68c7d16f9fc76e3a20a62fc3dde6aec8)