Revert "Merge branch 'origin/Solfamidas'"

This reverts commit b0558437dab66056c64670c73ba4978b82d32e62, reversing
changes made to 4690ba47242c822b10469b295f36b079a82ff9d9.