Backout b3973b49fe6c, 71190db0a57f for being a bit too restrictive to user choice