Revert "Merge remote-tracking branch 'origin/josep'"

This reverts commit 2796568f4e28bd470c050be025cb52c15e4bfee0, reversing
changes made to b49e320558292cd19c2a9f90ecb975c2b5f3f3b3.