Reverting so that this can be re-done as a PR

This reverts commit 20b272d4e656cf0c48bc4058c6bf289b80bd705f.