[#3028] Revert changes that are not actually needed.