remove dependency on other commits.

This branch now compiles on itself.