Revert dfe94b7..9975469

This rolls back to commit dfe94b78225f3b2d9b607ebdd360c673bee3378a.