Revert "OK. seems functional equivalent anyway"

This reverts commit f0d464de248bc95cdcc20eea6484119ed432c4ba.