Revert e89e49b..4856c02

This rolls back to commit e89e49bc7194aa2a12c73047364ce2156190fa03.