Switching back default behavior to avoid problems with existing code.