Back out experimental changes accidentally checked in with v3-0.0.3 version.

Ideally I'd revise the commit history here but since 0.0.3 was published to
npm I'm just patching and moving forward.