Revert fb9982c75ddcadbe2af2fa65c85d396046f6a484