Revert "simplify"

This reverts commit a956b23c8a5b230b576fd6bfc6d5a9dc2525f8c3.