Revert d4dacc1..b882bff

This rolls back to commit d4dacc15e1907d221409aa4b4a809e8cf55feb51.
as