Revert "Mix functions"

This reverts commit 67f654bc26bc12117fa9e1ff918d25c22c1d8991.