Revert to dc08d75bbea8d3ce1c7072722dc9f50b6b598547