This changeset breaks a number of CW tests, which depends on pre add hooks. I'm
backing it out, so that we can start the need-for-speed sprint with green tests
(and possibly rework this changeset)