Revert "Merge branch 'feature_two'"

This reverts commit df950930261436cde960259d2033f1d8d752d650, reversing
changes made to 31be3b3445fe9011b5728631dd5da0dbefd4a0e7.