Reverting le changes so I can attempt case switching for tile types again.
Merge remote-tracking branch 'origin/Matthew' into Matthew
Reverting changes to I can reattempt the case switch for tile types.