Tax on tap
Perhaps a transition measure would be to charge per bedroom and give a discount for each one converted for storage of redundant voting machines.
This, along with metering, would give a much-needed boost to the ailing construction sector and, as well as water, we might see light coming down the pipeline.