Initial hack-filled single-file commit.