Revert "Fix for 3.5 modal"

This reverts commit 6bcd8eb23111f1f0fce0b8df1ca977133fbf2855.