Meh changed my mind.

:D Made lots of code too verbose.
#1957