Revert to 1713bb8