Y U NO HAZ TESTS FOR THIS?!

This change is something that is realtively easy to test; and will allow you to clean up the code without fear.