Revert "Removed hammer @todo"

This reverts commit 92eaaaaa7b5cac609cbec99131c796f088d189fe.
Revert "Removed comment again"

This reverts commit af8d09d50347fc20ce61f80a6e4c67bdb560dca3.