Possibly they did something different in the past, but currently they do
the same. This commit just switches the handler, the newly unused code
will be removed in a later commit.

Change-Id: Ic5bade876c264e025543728916d9bcd871e32b9b