Revert "2.3.10.2 p"

This reverts commit 861c22ece8e984a855423e8892c1bcd63291e826.
Revert "+ todo.txt"

This reverts commit 0d39067fa8ab80cfef66b7956b03466cd3c8657a.