Reinstated temporarily commented out code.