This is a partial revert / fix for regression from 44d1811ebb Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
44d1811ebb