Version 1.2.0

This version largely reverts the breaking change mentioned in the
version 1.1.0 release, instead fixing the underlying bug that release
was trying to address. It should be API-compatible with v1.0.0.