Revert "An easy merge of the objectives"

This reverts commit f34a370f693fda49033fad8a9a035d5868940499, reversing
changes made to 4190ce9433a297893033ec1e51126da499e4e3f8.