Now ignoring Heroku compatibility in favor of the general case