Revert "Important commit 10-24"

This reverts commit 3780901fc172540c327b20be677611cfe20f4156.