Revert change from 1.39, because it causes a crash because of