No magic, revert some experimental changes in pipeline