Restore some commented out logic