Add the desired functionality from #1715's PR