Revert "Well that was muuuch simpler."

This reverts commit 002f021b7ade65edddeaf880c85abeb676bc1ba4.
Use operator@