I've removed the _.keys change from this PR.