Revert merge from branch tristan

This reverts commit 8e3de22759c21066e993fcca72ca875497e7008e.