JCR-2188: Removed the changes done for testing purpose