Needed due to changes from 8c59935e.
cc !146 (closed)
cc @rahix @schneider
Needed due to changes from 8c59935e. cc !146