Removed config workaround