Revert ec4b3d8e9cf4287c8a75e9cb4ea52aedd80037a0