Revert to e058526dc2c159701098ec45f116f9ce4e96bb24