Partially reverting I8e684f06 to restore some legacy behavior