Revert "COMMIT 2"

This reverts commit 61b437b40d405b2b0d8a9d34ce6cc8e6ce40ef14.