Revert "Minor performance optimization - change 'hook' to 'css' where able."

This reverts commit 3a643228d5f2d612c8d82b3947a4f692f00e7b71.
Revert "Merge branch 'velocity'"

This reverts commit b5e7612cc9557c65679e5aa8848a16c577275266.