This reverts commit 6850c7aff5 The referenced bug was actually not a bug. It was working as intended.
6850c7aff5