Revert "re-apply two core min"

This reverts commit e110d47a8f4f8f6ba4026629f2c49888921cf48e.
Ugh, what was I thinking in that last commit?
This one resolves it, but nothing can resolve my stupidity :p