0.10.0 - You win some, you lose some

There were some problems with the 0.9.0 implementation that only manifested themselves on an existing deployment of mine. I was concerned that the problem may affect others, so I'm reverting these changes as 0.10.0.

What's Changed

• Reverting fixes by @chrisguidry in #155

Full Changelog: 0.9.2...0.10.0