Back to original non-hardcoded version.