Reverted fix. It might be possible to make a better fix