REPORT-509:  Reverting changes merged in recently since they are not yet complete and we have a need to release a new version with some critical bug fixes.