This reverts commit 14abc044.
This reverts Foris part as well. The reForis part was reverted in 33ab8eff. It turns out that my assumption that both Foris and reForis behave the same that lead to only partial revert was invalid and Foris as it seems it all right. This matches the behavior of reForis.
In reaction to #705 (comment 230051).