Revert to 4e19f7e.