For this change I would really like to see an automated test, so that we do not regress anything. This is kinda hairy.