Fix for Issue #1671

This is a redesign of how we do module import