Reverting back the merge made earlier.

We need to figure out a way for this to work for different edge cases.
ngGrid is watching column defs so that is getting called which is
calling the rebuild.