Sweeping !135 from master to devel: fix: restored previous code

I failed to find out why this code was committed in a first place, and what was trying to solve... so just restoring for now.