Changes to CreatedBy and then reverted by
Some refactoring to reduce # of reads