Reverting back to approach with patches.

Signed-off-by: Natalia Bartol <natalia.b@zend.com>