Revert bugs 991210 980014 978338