This reverts commit 79f0aaea.

More code analysis is required in order to being able support required cases
with parameters passed by user.