Revert 93748e8..afefa0f

This rolls back to commit 93748e8f7a5b0d8b6c0bd1e7baf6807f06e8206a.