Revert "Merge pull request #4631 from atom/mb-new-config-api"

This reverts commit 5147fb6a8b5a0afd5add48430a4d68999e0bee30, reversing
changes made to 9bbbb5808452a49f173d51bdaf1b14cd21b02067.