Revert "More simple"

This reverts commit a78cbdc0a77f1165d92153c11cfd5075e15aad86.