Revert 6fa43d5db9b12adec4946966b76bf8cbf9b0d940