Rollback removal of auto-dependancy checking.