revert simplification changes