Revert to 9c474b46f6