Fix merge again

This picks up where #1433 left off.