Remove breaking change that sometimes crashed app on start