Revert "DeMerge branch 'feature3'"

This reverts commit 63511acfb5134aed65e0da271e42df23fe8f04fe, reversing
changes made to 6bdb66d2c77ccfddcf97c7825bb6708c718e5866.