Revert to 6e58fe6