Restore this part of the patch since its still needed