Backout ad3355a8d31f, c788ef01538a for being a bit too restrictive for user choice