Backout bug 1021018 because it's breaking in dev.

This reverts commit 29cab31ea513edb41bb365fcdf1940380a4eaf8d.