Revert d7209d2..8e91e3a

This rolls back to commit d7209d28c590111babf21513800c3fc12416b01d.
tyr1