Revert "Revert changes I didn't mean to make to master - sorry Andre Luckow"

This reverts commit ec1fb05df096a2fb4f01ebea353c259d086c95a8.