Revert broken changesets 3992 and 4026