Revert "Issue #2113911 by LewisNyman, longwave, nod_, rteijeiro: Modal style update."

Broke Bartik, still needs discussion.

This reverts commit 5a8a34e828f71859683e15df24bb8d505b2a7268.