Revert 7801b11..bbd5a7e

This rolls back to commit 7801b1152785e275afd6df93713d06b5ad222e73.