@dylanjbarth This is crappy and should be backed out.  Can you fix it when you merge this branch to yours?