Manual revert of d12c0711faa3d4333513fcbbbee4868bcb784a26