This reverts commit df9954ba0b927183d8fa4765e51f5b0033ff6168. The revert is to fix #606 for the 0.100 stable release.