Revert to 2ea7a52663bf180531afd0b576728a8c0d1ce32b