Experimental - hopefully allow for smallest app size

Or put back into nodpi.