Addresses https://github.com/joomla/joomla-cms/pull/1778#discussion_r5928601 Thanks Michael!