Reverted. Simplified lifecycle handling.