Revert commit c8a9ed9

Unexpected behavior occured fromt it. Erase that.