Reverting back to state before adding in plugins.

This reverts commit b4c861a27d80e392f65c796fa6a0be0ec719b4a8.