Commit c57fe6d78ae1e08dcbf7a084858e0ca49cc68ace

Ryan C. Gordon 2017-04-01T00:46:42

Backing out broken change from previous commit.