Revert 655d552..920d8a8

This rolls back to commit 655d552300116cdc801c3a280d0c24b5a9018628.