revert and fix-up l2..again