Revert to 2ee9648.