Revert to 05fba7bac11