Bug 948335, remove overrides for bouncer uptake now we have sensible defaults, r=catlee

--HG--
extra : amend_source : b8cbc6bf2abe18d4b5abb513ce0af1d3e60b83a9