Revert "Added new version of stub registrator."

This reverts commit f1290352576071e93fc0b543d3ae6fafd2987ead.