Revert "Simplify"

This reverts commit fdac8f30fd825e3f359e7cdfc6463829042699da.