Revert "COMMIT 3"

This reverts commit 245e8b6a0c08ea5d42ca9535587f1a97e9f779c3.