Revert 6fc8e4e35d822ab7205579f687365ac5ee9802d4