Please revert 6.1 changes.