Removed Definitions... again...

The diff was poorly displayed. This should get it back into the same
state. Let me know if there's any other changes that I need to apply.