This is going to conflict with #3582