Partially removed commits until fix