Issue #13: Fix issue where gapi was no longer being defined.