Fixes 2094 by enabling addon/index.js