Bring in diff to make IG/FB work from Liyan