Revert "Merge pull request #16262 from benfrancis/959694-master"

Fixed merge conflicts in apps/system/js/bootstrap.js