Revert to 6ef477049668b4f5632e7d88a67da1354f5796fe