Revert "Merge branch 'yearly_plans'"

This reverts commit d5dec7eb340b83556372edab77f0e54732921aee, reversing
changes made to ad10d3f4f12074765c4ab11f21367d05857859a6.