Reverted merge that broke building