Rollback accidental changes from commit (74f53b7d7f6ff00144152aff453e6b388447320c)