Bugfix/1068093v2

I don't think we need this anymore.