circle and annulus (reverted from commit 81aef48491ab5487743acf85287c46a876dfaca7)