Not used anymore in new implementation.