Fixed spiral vase regressions. Includes regression tests. #1773