Revert "Merge pull request #175 from rails/allow-sprockets-3"

This reverts commit 5d92c897ebf755356a7863d27ae1d162469b337f, reversing
changes made to 0754a227c4eb3651fa145b23a2332cc4918f9298.
Merge branch '2-1-stable' into 2-2-stable