remove stuff around pay_server (bug 748827)
Merge pull request #1802 from andymckay/748827-two

remove stuff around pay_server (bug 748827)