Revert "Merge branch 'master' into 3dtransforms"

This reverts commit 80a6c0f7923a5700a7a91820863a72382a43f4cd, reversing
changes made to 335e288786bc870a78bd3c5bd0781c44197a1402.