Revert "trying without gapi"

This reverts commit 137db15f9d4f0d19272fc3247462c240b572f7c1.