d1f1f1142e
There is a side effect because some modal doesn't have a proper "ok"
button.
This reverts commit 050c38ca19.