Revert d6f63ed..5caa123

This rolls back to commit d6f63ed45c7da7dfae84430aa9540b32ab2e65b1.