Follow up for issue #2909: Only remember decision if requested