This reverts commit 96d037968f.
It also contains the underyling fix for loading plugins correctly. The
importHref function expected functions for onload and onerror arguments
and passing null instead was causing the unexplained behavior.
Change-Id: Ic2a36d9bfcf85e5769c26ab49caf15e572d9463e