Revert 16e151c..da00752

This rolls back to commit 16e151c5855cc9423499bfe40b6620cc1b932d67.
Flex really didn't work.