Revert "Merge branch 'devdiva-master'"

This reverts commit e7326c473d81633e88453e7457b708e4e891f233, reversing
changes made to 1a74c9bf21922fbfa1f7ae3e99555fef30466c6a.