New bid to repeal medical device tax includes energy 'pay-for'