Merge "Revert "Fix non-existent module error""