Reverse 2510 commit

@damithc This is the branch which reversed commit for issue 2510