Revert ba7ed0f40925a3523f7a74eb5dac8eae1f5cb72a