Revert to 8f470ee891dae7549d7039f4574d3eb1319b8ad0