Revert "Merge pull request #1049 from jgunderson/21859-1"

This reverts commit a0373ec5312138e08c5fcd2c9ef81a819eac1d63, reversing
changes made to fd7d36f8c8c235a1ab97efcbf81b7d09f53639d0.
Revert "Merge pull request #1067 from shackbarth/unbilling"

This reverts commit 459a4f111ae8ae5ab67cc9c02a7a688d6b5f0085, reversing
changes made to 05a0dffc2b8c433c3452879fa36912e8198330df.