revert AMBARI-5732