Revert "Commit 21"

This reverts commit fcd18191d984f73c735e4dfbb566bb7205c5c976.