Reapplying CSS removed while rebasing. CSS and JS is broken after the rebase to recent upstream master!