Revert e6761ea2aa7897eda7dafa0b11f17c26eb60e334