Revert "always use bin-by-bin efficiencies (remove code for average efficiencies)"

This reverts commit 5b078864de5c23f815dcc7b03c149ec50867e3e4.