Backed out previous moduleinfo change.