use r.js proper rather than amd-optimize (bug 1092718, 1078093)