Reverted change #1321