Many years ago, we introduced "temporarily" 28dac17 in #726 , I think it's time to revert it.

I'd like to get input for this from @stevenroose @instagibbs @apoelstra @jonasnick