Revert d1a6b0e..edd5f70

This rolls back to commit d1a6b0e774c3b79cfd5f41cb6b6440c250b5808f.