swapping to use angular for non spike work [#56109594]