Backed out recent changes that broke the complete cycling behavior.