This reverts commits ea5c3650d98a89def5bc3907362f0418c167c923 and f21350e78dc5f1d52b45be666a0e849141ab1a3d.