Temporary solution to the Use Yesterday's design issue