Revert changes from #230, needs a different approach as noted in #237.