Don't add the extra method in IntentBuilder with @ServiceAction

This PR solves the issue #1070.
:+1:  Nice refactor on these two methods.