mozilla/bedrock — pull request #1526 by jgmize (2013-12-16 20:32:05+00:00)
Title: Revert changes from PR #1470

Per discussion in bug.