Updated the 5.3.0 16981 Module to 5.4.7 17956. Now we can move the handlers to it and use it.