Return back stubs
Merge pull request #593 from ovr/return_stubs_back

Return  stubs back