Revert "Merge branch 'refs/heads/feature/633-rem'"

This reverts commit ad47811724ae14f47ea366e072343b88fe0b66ff, reversing
changes made to 67f6d40af9050f888d791a15e278e4819a140369.