Revert "Uncommet the old method becouse the new maybe is unconsistent"

This reverts commit fd2d85a6bf942ccb881b20098aa013fd8c16ac0b.