#2172891, #2227791 Revert 406d232