Commit b6f60a4d964d66b562092fdeb8f76e902bf05fa4

Ben Straub 2013-09-21T22:02:23

Clean up ported code