This reverts commit e5c7fdda.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.