Add boolean flag to disable buggy experimental steps feature