Originally I had hoped to make this a more encompassing change, but
for now this was a lot simpler.
I'm hoping we can leave the copyrights alone on this one, as I'm worried that otherwise the automatic sweep into master will fail.
cc @strichte @jburr @vgoumarr @jpoveda
