Revert to PR #11