Revert "Simplify"

This reverts commit a80d0e3713c400ec72852423f4693e6a31b6ea7e.
This breakes compatibility...