This reverts commit bcbe7a8a6f442153dddc48f879027e49c8ecf5db. Need to push a fix and retag 3.0.1-stable, sorry.