Restore  behavior for temporary compatibility