Revert d721be4..a09c4ed

This rolls back to commit d721be4e48850c826cb1e526cb0b91e24dd3071c.
counter