Revert "Fix 1761"

Commit message must be changed?