Not ready for previous changes, revert to stable code.