Applied same changes as skyrocket for defconfig