Revert to 6286e8b191