Walk back changes for LDC which doesn't support package.d as yet.
More changes walked back...