Revert 58744e4bd579ef7b428562e810174bebe889211e