Restoring PR 3455 functionality