Revert changes in #3706 due to the inconveniency which developers reported by commenting the added line.