Revert "Fix trivial issues in PR#3305"

This reverts commit f82595e219fdcc2bcdfedf3eb38d70da27402b99.