Revert to commit ac574826c13d99d7375bf1148e59e056a911966d