swapped back and just explicitly return null. okay to merge?