Revert "ep floated option blocks"

This reverts commit 552d07af03ba296f74710e0b1999e3a0a809996c.

References #232