Updates #1668 Co-authored-by: Will Norris <will@willnorris.com> Signed-off-by: Brad Fitzpatrick <brad@danga.com>