Revert "Reapply nicks change"

This reverts commit fe293532fcf92361212bba2a9d80e00ba4c1a15a.

This is breaking IE7 and IE8 unit tests. More information to follow.