Somehow this file got majorly foobar'd during that last merge. Reverting.