Revert changes after commit e74c2c9 due to messy updates 569dd99 Raj Jayendrakumar Muchhala commited on Feb 5