Revert "mux on wrong side of flop"

This reverts commit 9c872e5f5f805dc0b4bcc318a2cac87c09e2b9be.