Back out one of the previous changes, it causes a crash. Whoops!