Revert "- rewrite"

This reverts commit b572a47bd4482e10c512377c3a8eb55115715c56.