Does removing these have anything to do with this change? Maybe this should be it's own commit/PR?