Switched back to using Consumer instead of Handler.