Revert "Merge remote-tracking branch 'naddiseo/master'"

This reverts commit 22ef6fc7f84869d3f2efb646ba080e29ae211d30, reversing
changes made to f7cba9bb737975ea9260cab427c13684ffd233b2.