In the new hook system, it is invalid to have two hooks that differ only in case. This reverts commit afb5b38e15. Change-Id: I160ece0a7bc68c748037b383137364b787be86a0
afb5b38e15