Revert back to ec3179df9fdf8579238eb2dc1c175faa49382ec2