Nit: These changes could be reverted