Is The Energy-Only Bill About To Make A Comeback?