Remove previous implemented code for bug fix as it turns out that the code doesn't fix the bug.