Revert 66db1f9d0975ab21f7f11f730527dc1045e55898