* Revert r36478; I don't see the point in this cryptic code