Revert changes from Michael because that can be customized on an application level