Large emergency rewrite due to funny bug with Celluloid+Bunny+ENV