Revert "might kill (fix) a important bug"

This reverts commit fbc2b71f0cfe3a71b0b5969af55255013ecedfd8.