Revert to simpler implementation