[12679] Revert [12646]. This needs to be fixed in another way!

Close scriptdev2/scriptdev2#113