Removed in PR #12