Revert 2c1a1d8..c11caf5

This rolls back to commit 2c1a1d8bda25de5e039f66791a62f4bccf263def.