This reverts commit 41019e48bbf082c985e6ba3bad34d118b903bff1.
Thanks Mariusz Felisiak and Tim Graham for reviews.