Reverting back to original Configuration.java from dev branch