Revert to commit 18a62aa89a00bea540915d3fcc4339d48b04fd6d