Let the code stay as-is for the normal (not DISABLE_DYNLOADING) case.

This partially reverts commit f5ba1a09.

Change-Id: I040e05844f9438ace39cf419a9a9e757002f9719