Revert "Update core options"

This reverts commit c8eea293.
20 jobs for master in 20 minutes and 20 seconds (queued for 15 minutes and 4 seconds)