Swapped back to normal build again.