Revert last commit due to changed semantics found by make release.