Commit 80cfccbf8d4aa86089f5cbf90ccdc9a87444877e

Ryan C. Gordon 2015-05-26T22:57:42

Back out changeset b80349dd6d40. This change didn't do what I thought it did, sorry.