Rempve 989 from 3.01a-integration