Revert "Multiple fixes, please read extended description"

This reverts commit a228b87fcc81bcd65175672b36724c6682bdce3b.