Revert "Merge branch 'development' into yearly_plans"

This reverts commit 2e2868639c25db6c58cda41325876999859ae3f7, reversing
changes made to fd4252101f579aabbfa8bf483904cc54e98e54f5.