Revert "deMerge branch 'feature2'"

This reverts commit 97b8f7c65337b86dccd94247bba78b36fe88a007, reversing
changes made to 6ad278324bd459b444bae451771765d6a7b6cb61.