Fix #3741, simplifying things in the process