Revert "Merge pull request #1201 from BrentleyJones/fixed_modals"

This reverts commit 7e889c4e24acb41e58d8640844e472ab02f338df, reversing
changes made to e9d37f395f457fc8c3b0acae3859056c5fad6a67.