Revert "Commit 19"

This reverts commit d8145002eff63725e3721b97e786f82db69a9ec3.
Commit 20