Revert "Fix the unused local variable issue"
Revert "Fix the unused local variable issue"

This reverts commit a386bf546aee0bcc8bda1a63ebc02b713f1bb533 as it does not fix the issue as expected.

marcus-campos/maestro