Use @mburbea's suggestion from #1169