This reverts commit 5ad2b9c82b, 5c32a7bf58, and 83f465faca. (#1387, #1356)
5ad2b9c82b
5c32a7bf58
83f465faca