Implementation that was lost with last merge...