Close #4922 #3983

I am not sure this is the right way to do yet, but this will act as a
work-around, until we have a proper fix