Changed file back to upstream master to remove unneeded changes