Don't mutate passed-in props, take 2
Merge pull request #640 from spicyj/immutable-props-2

Don't mutate passed-in props, take 2