[Bug 899984] fix requests taking too long [r=gregorwagner]