Revert "Merge branch 'dev' into thomas"

This reverts commit ecb62ea585b763f2bdc98e02e71cc2cd545df648, reversing
changes made to 8f2284351d96230077a2341c1ccadfc2b436f556.