Revert part of dcc614