Revert #4305

Reintroduces #4290

I tried hacking this and preventing the endless loop but I didn't
succeed. Let's revert this for now until we find a better solution.

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>