Reverted back to initial version. In order to keep repository consistent.