Reverted wagon to a version that works