Revert "COMMIT 5"

This reverts commit ae04cff34fb5f866a99ce8df5006afcf2771ea18.