revert PR #566