Revert changes coming from #167 and #169.#180

Merged

gslowikowski merged 1 commit intoscoverage:masterfrom

gslowikowski:revert-pr-167-and-169

Sep 17, 2016

Commits on Sep 17, 2016

Revert changes coming from #167 and #169.
gslowikowski
committed