ref #8526: remove workaround for hotfix