Revert "Merge branch 'new_functionality'"

This reverts commit cfd0e36585bcd0f341bcc2b38927943eff16e2a6, reversing
changes made to 41b11677ec4fb830a56813808f868ad60a756ad4.