Revert to 6e66a