Revert 27ba436..ac13b82

This rolls back to commit 27ba436a57283f79ffb10ec1fba2b20348d759fa.
Corrected character changing logic