Move back to Gradient

Change-Id: I8aa7a35fe39d52a90bb5df66608e6bf10074792b