Reverse commit
Reverse commit for issue 2510