Reverting my change. Needs more thinkin'