This is a temporary fix to #4793