Revert "Merge remote-tracking branch 'origin/master' into copernica-changes"

This reverts commit f9e55f7733bff77c7066ed6c702ebd8508696b00, reversing
changes made to 669a0530c37f5cc95cf361db0d9aaa59c21ea2b0.