Revert "Merge branch 'robbert/sprop' into 'master'"

This reverts merge request !309 (merged). It turned out to be a breaking change due to shadowing imports, and also cause performance regression in at least one case (see iris!732 (comment 73457)).