Cleans 4f4c7395515986feebde8cdb5fd5bd7097877815.

Copy/pasting code without modification is evil!  Don't do it again, please!