b0438c8f99
This reverts commit 5ad2b9c82bd9a92b80b935cb268cedb35008da86, 5c32a7bf58176bb5d2c5e22260cfe1d8a0844808, and 83f465faca3107c6406972d913d3f194412d9494. (#1387, #1356)