revert PR #1030