#4786 reborn

The return of #4786.