Can we re-enable or delete this commented out code? It's almost due a birthday I suspect :)