This is an addictive little module, but it needs to work in 4.7..

This patch does the trick.

Probably could be trimmed down a bit mind you so feel free to modify it.