Revert "switching to butterfly"

This reverts commit af6fa1bd38bf049e7890b210b2cd660caa242778.
reverted