BUGFIX: I meant to check out the trunk all along
Corrected TODO: