Revert bb576403.

See issue #2.